merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 1 Sep 2010 02:03:05 +0000 (11:03 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 1 Sep 2010 02:03:05 +0000 (11:03 +0900)
commitc877d7aeb4f12945714aa11bdbbe1a340d02e19e
tree9e5c00c648f4d00517bf62e6456d61b2d169273e
parent2614473a941a3f74a8065966d78e88498d9d6ce8
parent023d1eaad44e3e276304276ad67bb082f953ad14
merge trunk